From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 2 Jun 1993 17:09:37 +0000 (+0000)
Subject: (diff): Really do use arg SWITCHES.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~95631
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=16776caac4217233cb1ba170064206bd7358fe81;p=emacs.git

(diff): Really do use arg SWITCHES.
---

diff --git a/lisp/diff.el b/lisp/diff.el
index 0c474672b70..d4c5f5d3a2e 100644
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -196,9 +196,14 @@ With prefix arg, prompt for diff switches."
 	(let ((command
 	       (mapconcat 'identity
 			  (append '("diff")
-				  (if (consp diff-switches)
-				      diff-switches
-				    (list diff-switches))
+				  ;; Use explicitly specified switches
+				  (if switches
+				      (if (consp switches)
+					  switches (list switches))
+				    ;; If not specified, use default.
+				    (if (consp diff-switches)
+					diff-switches
+				      (list diff-switches)))
 				  (if (or old-alt new-alt)
 				      (list "-L" old "-L" new))
 				  (list (or old-alt old))